Add missing cast.

Wed Sep 19 17:28:47 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwidget.c (gtk_widget_new): Add missing cast.

	* gtk/gtkmenuitem.[ch] gtk/gtkmenushell.c: Underscore prefix
	non-public _gtk_menu_item_set_placement.

	* gtk/gtktooltips.h: Deprecate gtk_tooltips_set_delay().

diff --git a/ChangeLog b/ChangeLog
index 0715d159d5b569d1f4e78b735b44816ca64133b9..d9bdd2e87b5aedd064f7cdc29275c58b11c9adee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Sep 19 17:28:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_new): Add missing cast.
+
+       * gtk/gtkmenuitem.[ch] gtk/gtkmenushell.c: Underscore prefix
+       non-public _gtk_menu_item_set_placement.
+
+       * gtk/gtktooltips.h: Deprecate gtk_tooltips_set_delay().
+
 Wed Sep 19 16:16:38 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/win32/gdkcolor-win32.c gdk/x11/gdkcolor-x11.c 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0715d159d5b569d1f4e78b735b44816ca64133b9..d9bdd2e87b5aedd064f7cdc29275c58b11c9adee 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Wed Sep 19 17:28:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_new): Add missing cast.
+
+       * gtk/gtkmenuitem.[ch] gtk/gtkmenushell.c: Underscore prefix
+       non-public _gtk_menu_item_set_placement.
+
+       * gtk/gtktooltips.h: Deprecate gtk_tooltips_set_delay().
+
 Wed Sep 19 16:16:38 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/win32/gdkcolor-win32.c gdk/x11/gdkcolor-x11.c 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0715d159d5b569d1f4e78b735b44816ca64133b9..d9bdd2e87b5aedd064f7cdc29275c58b11c9adee 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Wed Sep 19 17:28:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_new): Add missing cast.
+
+       * gtk/gtkmenuitem.[ch] gtk/gtkmenushell.c: Underscore prefix
+       non-public _gtk_menu_item_set_placement.
+
+       * gtk/gtktooltips.h: Deprecate gtk_tooltips_set_delay().
+
 Wed Sep 19 16:16:38 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/win32/gdkcolor-win32.c gdk/x11/gdkcolor-x11.c 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0715d159d5b569d1f4e78b735b44816ca64133b9..d9bdd2e87b5aedd064f7cdc29275c58b11c9adee 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Wed Sep 19 17:28:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_new): Add missing cast.
+
+       * gtk/gtkmenuitem.[ch] gtk/gtkmenushell.c: Underscore prefix
+       non-public _gtk_menu_item_set_placement.
+
+       * gtk/gtktooltips.h: Deprecate gtk_tooltips_set_delay().
+
 Wed Sep 19 16:16:38 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/win32/gdkcolor-win32.c gdk/x11/gdkcolor-x11.c 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0715d159d5b569d1f4e78b735b44816ca64133b9..d9bdd2e87b5aedd064f7cdc29275c58b11c9adee 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Wed Sep 19 17:28:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_new): Add missing cast.
+
+       * gtk/gtkmenuitem.[ch] gtk/gtkmenushell.c: Underscore prefix
+       non-public _gtk_menu_item_set_placement.
+
+       * gtk/gtktooltips.h: Deprecate gtk_tooltips_set_delay().
+
 Wed Sep 19 16:16:38 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/win32/gdkcolor-win32.c gdk/x11/gdkcolor-x11.c 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0715d159d5b569d1f4e78b735b44816ca64133b9..d9bdd2e87b5aedd064f7cdc29275c58b11c9adee 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Wed Sep 19 17:28:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_new): Add missing cast.
+
+       * gtk/gtkmenuitem.[ch] gtk/gtkmenushell.c: Underscore prefix
+       non-public _gtk_menu_item_set_placement.
+
+       * gtk/gtktooltips.h: Deprecate gtk_tooltips_set_delay().
+
 Wed Sep 19 16:16:38 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/win32/gdkcolor-win32.c gdk/x11/gdkcolor-x11.c 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0715d159d5b569d1f4e78b735b44816ca64133b9..d9bdd2e87b5aedd064f7cdc29275c58b11c9adee 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Wed Sep 19 17:28:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.c (gtk_widget_new): Add missing cast.
+
+       * gtk/gtkmenuitem.[ch] gtk/gtkmenushell.c: Underscore prefix
+       non-public _gtk_menu_item_set_placement.
+
+       * gtk/gtktooltips.h: Deprecate gtk_tooltips_set_delay().
+
 Wed Sep 19 16:16:38 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/win32/gdkcolor-win32.c gdk/x11/gdkcolor-x11.c 

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 627d38c61f9fbf8d3539b20465c4c26b427c7f94..edc7f4f3f4cfebdff3748ef95a68d6418ac1cfa3 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -334,7 +334,7 @@ gtk_menu_item_remove_submenu (GtkMenuItem         *menu_item)
 }
 
 void
-gtk_menu_item_set_placement (GtkMenuItem         *menu_item,
+_gtk_menu_item_set_placement (GtkMenuItem         *menu_item,
                             GtkSubmenuPlacement  placement)
 {
   g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));

diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 90005d81f1e343c32014b7c29f72990b6381dead..1f46eaa8fb2af1568367a290e1a21444d5d7f06b 100644 (file)
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -94,7 +94,7 @@ void       gtk_menu_item_set_submenu          (GtkMenuItem         *menu_item,
                                               GtkWidget           *submenu);
 GtkWidget* gtk_menu_item_get_submenu          (GtkMenuItem         *menu_item);
 void       gtk_menu_item_remove_submenu       (GtkMenuItem         *menu_item);
-void       gtk_menu_item_set_placement        (GtkMenuItem         *menu_item,
+void       _gtk_menu_item_set_placement       (GtkMenuItem         *menu_item,
                                               GtkSubmenuPlacement  placement);
 void       gtk_menu_item_select               (GtkMenuItem         *menu_item);
 void       gtk_menu_item_deselect             (GtkMenuItem         *menu_item);

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 5fa8917b2ae7c29eae1fbb5edd9ea5ce4ebe0518..ffc1499b8275ace9ea05885c335ad1c20fd257ff 100644 (file)
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -784,7 +784,7 @@ gtk_menu_shell_real_select_item (GtkMenuShell *menu_shell,
   gtk_menu_shell_deselect (menu_shell);
   
   menu_shell->active_menu_item = menu_item;
-  gtk_menu_item_set_placement (GTK_MENU_ITEM (menu_shell->active_menu_item),
+  _gtk_menu_item_set_placement (GTK_MENU_ITEM (menu_shell->active_menu_item),
                               GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement);
   gtk_menu_item_select (GTK_MENU_ITEM (menu_shell->active_menu_item));
 

diff --git a/gtk/gtktooltips.h b/gtk/gtktooltips.h
index b88ae57d5d2ebf7725692feb3616d97c670b2d3c..825e9635a2cc0c34b7b4503f9087088b5bb64125 100644 (file)
--- a/gtk/gtktooltips.h
+++ b/gtk/gtktooltips.h
@@ -82,8 +82,10 @@ GtkTooltips*  gtk_tooltips_new          (void);
 
 void            gtk_tooltips_enable       (GtkTooltips   *tooltips);
 void            gtk_tooltips_disable      (GtkTooltips   *tooltips);
+#ifndef GTK_DISABLE_DEPRECATED
 void            gtk_tooltips_set_delay    (GtkTooltips   *tooltips,
                                            guint          delay);
+#endif /* GTK_DISABLE_DEPRECATED */
 void            gtk_tooltips_set_tip      (GtkTooltips   *tooltips,
                                            GtkWidget     *widget,
                                            const gchar   *tip_text,

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index c039bb06ab73db82cfceb2784b8ce9ba20d299f5..6227967e7e57bc8091c6094ad6adb0764a8fd532 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -1356,7 +1356,7 @@ gtk_widget_new (GtkType      type,
   g_return_val_if_fail (gtk_type_is_a (type, GTK_TYPE_WIDGET), NULL);
   
   va_start (var_args, first_property_name);
-  widget = g_object_new_valist (type, first_property_name, var_args);
+  widget = (GtkWidget *)g_object_new_valist (type, first_property_name, var_args);
   va_end (var_args);
 
   return widget;